popupMenu: Ignore submenus when getting the column widths

The new designs don't want these to be aligned the same way.

https://bugzilla.gnome.org/show_bug.cgi?id=702539

diff --git a/js/ui/popupMenu.js b/js/ui/popupMenu.js
index 8f6442f28425ffbe13512383c15307e7746cb553..1d78ec91629bdd5cd54c822624333b2c1aa3aa8b 100644 (file)
--- a/js/ui/popupMenu.js
+++ b/js/ui/popupMenu.js
@@ -890,9 +890,12 @@ const PopupMenuBase = new Lang.Class({
         let columnWidths = [];
         let items = this.box.get_children();
         for (let i = 0; i < items.length; i++) {
-            if (!items[i].visible &&
-                !(items[i]._delegate instanceof PopupSubMenu && items[i-1].visible))
+            if (!items[i].visible)
                 continue;
+
+            if (items[i]._delegate instanceof PopupSubMenu)
+                continue;
+
             if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof PopupMenuBase) {
                 let itemColumnWidths = items[i]._delegate.getColumnWidths();
                 for (let j = 0; j < itemColumnWidths.length; j++) {
@@ -907,6 +910,9 @@ const PopupMenuBase = new Lang.Class({
     setColumnWidths: function(widths) {
         let items = this.box.get_children();
         for (let i = 0; i < items.length; i++) {
+            if (items[i]._delegate instanceof PopupSubMenu)
+                continue;
+
             if (items[i]._delegate instanceof PopupBaseMenuItem || items[i]._delegate instanceof PopupMenuBase)
                 items[i]._delegate.setColumnWidths(widths);
         }